From af467cfb654135daf66fdf6d0cf14f6ae9aeb01c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 19 Dec 2005 05:28:49 +0000 Subject: [PATCH] Fix a crash --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtksettings.c | 3 +++ 3 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index c0957a8e50..0605fee1b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-17 Matthias Clasen + + * gtk/gtksettings.c (get_color_hash): Don't crash if + there is no color scheme. (#324429, Diego Gonzalez) + 2005-12-16 Matthias Clasen * gtk/gtkfilesystem.c (gtk_file_system_module_load): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c0957a8e50..0605fee1b5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-12-17 Matthias Clasen + + * gtk/gtksettings.c (get_color_hash): Don't crash if + there is no color scheme. (#324429, Diego Gonzalez) + 2005-12-16 Matthias Clasen * gtk/gtkfilesystem.c (gtk_file_system_module_load): diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 399c8e78f7..1199c452e3 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -1749,6 +1749,9 @@ get_color_hash (GtkSettings *settings) data = (ColorSchemeData *)g_object_get_data (G_OBJECT (settings), "gtk-color-scheme"); + if (!data) + return NULL; + return data->color_hash; } -- 2.30.2